Add files from parent branch HEAD:
contrib/rserv/Makefile

Fix contrib/rserv to install successfully when built outside source tree.
(Not that it will actually work with 7.3, I fear.)

Add files from parent branch HEAD:
contrib/seg/expected/seg.out

Ooops, forgot to fix contrib regression tests for WARNING/NOTICE change.

Add files from parent branch HEAD:
contrib/tsearch/Makefile

Need -I. to build outside source tree.

Add files from parent branch HEAD:
contrib/ltree/Makefile

Fix incorrect subdir value.

Add:

> * Have standalone backend read postgresql.conf

Add files from parent branch HEAD:
contrib/cube/Makefile
contrib/cube/cubeparse.y
contrib/seg/Makefile
contrib/seg/segparse.y
contrib/tsearch/query.c
src/backend/bootstrap/Makefile
src/backend/bootstrap/bootparse.y
src/backend/parser/Makefile
src/backend/utils/misc/Makefile
src/backend/utils/misc/guc.c
src/interfaces/ecpg/preproc/Makefile
src/interfaces/ecpg/preproc/preproc.y
src/pl/plpgsql/src/Makefile
src/pl/plpgsql/src/gram.y

Arrange to compile flex output files as inclusions into other files
(usually bison output files), not as standalone files.  This hack
works around flex's insistence on including <stdio.h> before we are
able to include postgres.h; postgres.h will already be read before
the compiler starts to read the flex output file.  Needed for largefile
support on some platforms.

Add files from parent branch HEAD:
contrib/btree_gist/expected/btree_gist.out
contrib/cube/expected/cube.out
contrib/intarray/expected/_int.out
contrib/ltree/expected/ltree.out
contrib/tsearch/expected/tsearch.out

Ooops, forgot to fix contrib regression tests for WARNING/NOTICE change.

Add files from parent branch HEAD:
src/backend/executor/nodeAgg.c
src/backend/executor/nodeAppend.c
src/backend/optimizer/path/indxpath.c

Reduce a couple of debugging messages from LOG to DEBUG1 category.

Add files from parent branch HEAD:
src/backend/commands/functioncmds.c
src/test/regress/expected/create_type.out
src/test/regress/output/create_function_1.source

Reduce messages associated with shell-type function arguments/results
from WARNING to NOTICE, since they are expected messages in common cases.

Add files from parent branch HEAD:
src/test/regress/expected/geometry-powerpc-darwin.out

Update to match expected results on OS X 10.2.

Add files from parent branch HEAD:
src/backend/utils/error/elog.c

After elog(PANIC), exit with abort() not proc_exit().  This allows a
core file to be produced for debugging, and avoids trying to run the
normal proc-exit cleanup hooks, which are likely to cause additional
problems if the system is hosed.

Add files from parent branch HEAD:
src/test/regress/resultmap

Correct ordering of geometry/freebsd entries, add one for freebsd5.

Add files from parent branch HEAD:
src/test/regress/expected/float8-exp-three-digits.out
src/test/regress/expected/float8-fp-exception.out

Update for test changes.

Add files from parent branch HEAD:
src/bin/psql/print.c

Avoid malloc(0) when printing a table of no columns.  On some platforms
this returns NULL, which confuses the code.

Add files from parent branch HEAD:
src/backend/storage/lmgr/deadlock.c
src/backend/storage/lmgr/lock.c

Fix some bogus comments.

Add files from parent branch HEAD:
src/backend/main/main.c

Add missing #include <errno.h>, per gripe from Alessio Bragadini.

Add files from parent branch HEAD:
doc/src/sgml/datatype.sgml

Update description of timestamp types for 7.3 implementation.

Add files from parent branch HEAD:
src/backend/utils/hash/dynahash.c

Got tired of explaining why this Assert is not wrong.

Add files from parent branch HEAD:
src/backend/storage/lmgr/README
src/backend/storage/lmgr/proc.c
src/backend/tcop/postgres.c
src/include/storage/proc.h

Code review for statement_timeout patch.  Fix some race conditions
between signal handler and enable/disable code, avoid accumulation of
timing error due to trying to maintain remaining-time instead of
absolute-end-time, disable timeout before commit not after.

Add files from parent branch HEAD:
src/backend/commands/vacuum.c

Fix miscalculation of remaining free space during tuple chain moving.
Only affects machines where MAXALIGN > 4, and is a boundary-condition
case even there, but still surprising that it's not been identified
before.  Also reduce tuple chain move give-up messages from WARNING
to DEBUG1, since they are not unexpected conditions.

Add files from parent branch HEAD:
contrib/dbase/dbf2pg.c
src/backend/utils/sort/tuplesort.c

Avoid use of inline functions that are not declared static.  Needed to
conform to C99's brain-dead notion of how inline functions should work.

Clean up gram.y trailing spaces.

Add files from parent branch HEAD:
doc/src/sgml/nls.sgml

Add mention of T on .pot files, from [email protected]

Add files from parent branch HEAD:
src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java

Return something meaningful for Statement.getFetchSize().  Previously we were
returning an exception when this method was called.

Modified Files:
jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java

Clean up Unixware entry for Larry Rosenman

Add files from parent branch HEAD:
src/test/regress/expected/join.out

Add additional ORDER BY to join regression test, per Tatsuo.

Add files from parent branch HEAD:
src/test/regress/sql/join.sql

Remove /src/utils.  Is final cleanup of getopt.c resurection.

Add files from parent branch HEAD:
src/bin/psql/common.c
src/bin/psql/common.h

Add popen/pclose -> _popen/_pclose() mapping for Win32.

Update ports list.

Update ports list.

Update ports list.

Update comments.

Add files from parent branch HEAD:
src/bin/psql/win32.mak

getopt.c now in /port, for MS Win.

Re-add getopt.c for MSWin psql.

Re-add getopt.c.

Clean up markup in ports list.

Update ports list.

Update regression for FreeBSD 4.7, for Larry Rosenman

Update Giles email address.

Reword:

< * Improve concurrency in GIST
> * Add concurrency to GIST

Update port list.

Update port list.

Done:

> * -Prevent aggregates from being used in rule WHERE clauses

Update port list.

Update port list.

Add ORDER BY to join regression test.

Update from Neil Conway:

< * Add floor(float8) and other missing functions
> * -Add floor(float8) and other missing functions
174c174
< * Improve concurrency of hash indexes (Neil Conway)
> * Improve concurrency of hash indexes (Neil)
277c277
<  o Allow array declarations and other data types in PL/PgSQl DECLARE
>  o Allow array declarations and other data types in PL/PgSQL DECLARE
293c293
< * -Have pg_dump use ADD PRIMARY KEY after COPY, for performance (Neil Conway)
> * -Have pg_dump use ADD PRIMARY KEY after COPY, for performance (Neil)
474c474
< * Precompile SQL functions to avoid overhead (Neil Conway)
> * Precompile SQL functions to avoid overhead (Neil)
549c549
< * Neil is Neil Conway <[email protected]>
> * Neil is Neil Conway <[email protected]>

fseeko NetBSD fix.

Update ports list.

Add files from parent branch HEAD:
src/bin/pg_dump/pg_backup_archiver.c

Suppress compile warnings on OS X.

Update ports.

Update ports list.

Update port list.

Update ports.

Add files from parent branch HEAD:
contrib/chkpass/chkpass.c
src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c
src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c
src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c
src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c
src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c
src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c
src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c
src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c
src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c
src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c
src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c
src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c
src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c
src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c
src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c
src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c
src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c
src/backend/utils/mb/conversion_procs/utf8_and_tcvn/utf8_and_tcvn.c
src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c
src/backend/utils/mb/conversion_procs/utf8_and_win1250/utf8_and_win1250.c
src/backend/utils/mb/conversion_procs/utf8_and_win1256/utf8_and_win1256.c
src/backend/utils/mb/conversion_procs/utf8_and_win874/utf8_and_win874.c

Add missing semicolons to a few PG_FUNCTION_INFO_V1 calls.

Update BSD/OS as supported platform.

Add files from parent branch HEAD:
src/include/fmgr.h

Add dummy variable declaration to PG_FUNCTION_INFO_V1() to prevent
'empty declaration' warnings from compilers that care about such things.
Per discussion back before 7.2 release; we didn't do it then because
we'd already missed all the beta cycle ...

Add files from parent branch HEAD:
src/include/utils/int8.h

Remove #warning directive, which is nonstandard and isn't really
buying us anything to make it worth the porting risk.  Per discussion
quite some time ago.

Add:

> * Allow limits on per-db/user connections

Change to fseeko(), per Philip.

Patch submitted by Kris Jurka to fix arrayindexoutofbounds exception caused
by improper array initialization.

 Modified Files:
  jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java

Add files from parent branch HEAD:
src/bin/pg_dump/common.c
src/bin/pg_dump/pg_backup_archiver.h
src/bin/pg_dump/pg_backup_custom.c
src/bin/pg_dump/pg_backup_files.c
src/bin/pg_dump/pg_backup_tar.c

Allow fseeko in pg_dump only if fseeko() will work for all supported file
sizes.

Add files from parent branch HEAD:
src/interfaces/libpq/fe-connect.c
src/interfaces/libpq/fe-misc.c

Code review for connection timeout patch.  Avoid unportable assumption
that tv_sec is signed; return a useful error message on timeout failure;
honor PGCONNECT_TIMEOUT environment variable in PQsetdbLogin; make code
obey documentation statement that timeout=0 means no timeout.

Add files from parent branch HEAD:
src/backend/postmaster/pgstat.c

Fix some places that were unportably assuming struct timeval's tv_sec
field is signed.  Clean up casting.

Add files from parent branch HEAD:
src/backend/parser/parse_coerce.c
src/backend/parser/parse_func.c
src/include/parser/parse_coerce.h

Function-call-style type coercions should be treated as explicit
coercions, not implicit ones.  For example, 'select abstime(1035497293)'
should succeed because there is an explicit binary coercion from int4
to abstime.

Add files from parent branch HEAD:
doc/src/sgml/ref/select.sgml