git.postgresql.org Git - users/hanada/postgres.git/commit

author	Shigeru Hanada <[email protected]>
	Thu, 25 Nov 2010 03:53:51 +0000 (12:53 +0900)
committer	Shigeru Hanada <[email protected]>
	Thu, 25 Nov 2010 03:53:51 +0000 (12:53 +0900)
commit	97235ed5144651fdb0cd5bc8c9026ea087b86171
tree	b5f12e832569d77fc314fdc57683b9674eeb0fc2	tree
parent	d3d2eb82d22dc2def330c864a5640a85667d411c	commit \| diff
parent	7276ab5888d85782d988fc297ad2e176c7ad1bca	commit \| diff

Merge branch 'master' into fdw_core

Conflicts:
src/backend/commands/tablecmds.c

23 files changed:

doc/src/sgml/catalogs.sgml	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/ref/comment.sgml	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/ref/create_sequence.sgml	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/ref/lock.sgml	diff1 \|	diff2 \|	blob \| history
src/backend/catalog/information_schema.sql	diff1 \|	diff2 \|	blob \| history
src/backend/catalog/objectaddress.c	diff1 \|	diff2 \|	blob \| history
src/backend/commands/alter.c	diff1 \|	diff2 \|	blob \| history
src/backend/commands/comment.c	diff1 \|	diff2 \|	blob \| history
src/backend/commands/explain.c	diff1 \|	diff2 \|	blob \| history
src/backend/commands/tablecmds.c	diff1 \|	diff2 \|	blob \| history
src/backend/nodes/copyfuncs.c	diff1 \|	diff2 \|	blob \| history
src/backend/nodes/equalfuncs.c	diff1 \|	diff2 \|	blob \| history
src/backend/optimizer/util/plancat.c	diff1 \|	diff2 \|	blob \| history
src/backend/parser/gram.y	diff1 \|	diff2 \|	blob \| history
src/backend/utils/cache/syscache.c	diff1 \|	diff2 \|	blob \| history
src/bin/pg_dump/pg_dump.c	diff1 \|	diff2 \|	blob \| history
src/include/catalog/indexing.h	diff1 \|	diff2 \|	blob \| history
src/include/nodes/parsenodes.h	diff1 \|	diff2 \|	blob \| history
src/include/nodes/relation.h	diff1 \|	diff2 \|	blob \| history
src/include/utils/builtins.h	diff1 \|	diff2 \|	blob \| history
src/test/regress/expected/alter_table.out	diff1 \|	diff2 \|	blob \| history
src/test/regress/expected/type_sanity.out	diff1 \|	diff2 \|	blob \| history
src/test/regress/sql/type_sanity.sql	diff1 \|	diff2 \|	blob \| history

Hanada's development tree.

doc/src/sgml/catalogs.sgml	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/ref/comment.sgml	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/ref/create_sequence.sgml	diff1 \|	diff2 \|	blob \| history
doc/src/sgml/ref/lock.sgml	diff1 \|	diff2 \|	blob \| history
src/backend/catalog/information_schema.sql	diff1 \|	diff2 \|	blob \| history
src/backend/catalog/objectaddress.c	diff1 \|	diff2 \|	blob \| history
src/backend/commands/alter.c	diff1 \|	diff2 \|	blob \| history
src/backend/commands/comment.c	diff1 \|	diff2 \|	blob \| history
src/backend/commands/explain.c	diff1 \|	diff2 \|	blob \| history
src/backend/commands/tablecmds.c	diff1 \|	diff2 \|	blob \| history
src/backend/nodes/copyfuncs.c	diff1 \|	diff2 \|	blob \| history
src/backend/nodes/equalfuncs.c	diff1 \|	diff2 \|	blob \| history
src/backend/optimizer/util/plancat.c	diff1 \|	diff2 \|	blob \| history
src/backend/parser/gram.y	diff1 \|	diff2 \|	blob \| history
src/backend/utils/cache/syscache.c	diff1 \|	diff2 \|	blob \| history
src/bin/pg_dump/pg_dump.c	diff1 \|	diff2 \|	blob \| history
src/include/catalog/indexing.h	diff1 \|	diff2 \|	blob \| history
src/include/nodes/parsenodes.h	diff1 \|	diff2 \|	blob \| history
src/include/nodes/relation.h	diff1 \|	diff2 \|	blob \| history
src/include/utils/builtins.h	diff1 \|	diff2 \|	blob \| history
src/test/regress/expected/alter_table.out	diff1 \|	diff2 \|	blob \| history
src/test/regress/expected/type_sanity.out	diff1 \|	diff2 \|	blob \| history
src/test/regress/sql/type_sanity.sql	diff1 \|	diff2 \|	blob \| history