Merge branch 'master' into per_column_option
authorShigeru Hanada <shigeru.hanada@gmail.com>
Tue, 5 Jul 2011 04:58:04 +0000 (13:58 +0900)
committerShigeru Hanada <shigeru.hanada@gmail.com>
Tue, 5 Jul 2011 04:58:04 +0000 (13:58 +0900)
commit971dee43a78ae3363ba835bf571a299c6193851c
tree1953dbd25443351a171d229d358c6be4dd020cc6
parentcbe924fb36e918ce22400fd0c59fba981c4e7745
parent27af66162baed6a964466b92902accebdd5ae7c7
Merge branch 'master' into per_column_option
doc/src/sgml/catalogs.sgml
doc/src/sgml/information_schema.sgml
src/backend/catalog/heap.c
src/backend/catalog/information_schema.sql
src/backend/commands/tablecmds.c
src/backend/parser/parse_utilcmd.c
src/test/regress/expected/foreign_data.out
src/test/regress/sql/foreign_data.sql