diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml
index f18d4c1480eb1086c7628a22feac74e5c297ba05..ad702f6326395e84db7584069ceb6f0906a3d99a 100644
--- a/doc/src/sgml/syntax.sgml
+++ b/doc/src/sgml/syntax.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/syntax.sgml,v 1.114 2007/02/01 19:10:24 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/syntax.sgml,v 1.115 2007/02/06 09:16:07 petere Exp $ -->
<chapter id="sql-syntax">
<title>SQL Syntax</title>
@@ -136,7 +136,7 @@ INSERT INTO MY_TABLE VALUES (3, 'hi there');
<symbol>NAMEDATALEN</symbol> is 64 so the maximum identifier
length is 63. If this limit is problematic, it can be raised by
changing the <symbol>NAMEDATALEN</symbol> constant in
- <filename>src/include/postgres_ext.h</filename>.
+ <filename>src/include/pg_config_manual.h</filename>.
</para>
<para>
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index 110619425b1d298a0311c1b45e0ab8097347468b..0482467bbbe5bd3233b8b6b4d7d87f8034ac8865 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -2,7 +2,7 @@
#
# Makefile for backend/catalog
#
-# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.61 2006/12/23 00:43:09 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.62 2007/02/06 09:16:08 petere Exp $
#
#-------------------------------------------------------------------------
@@ -45,8 +45,7 @@ postgres.description: postgres.bki ;
postgres.shdescription: postgres.bki ;
-postgres.bki: genbki.sh $(POSTGRES_BKI_SRCS) \
- $(top_srcdir)/src/include/postgres_ext.h $(top_builddir)/src/include/pg_config_manual.h
+postgres.bki: genbki.sh $(POSTGRES_BKI_SRCS) $(top_builddir)/src/include/pg_config_manual.h
AWK='$(AWK)' $(SHELL) $< $(pg_includes) --set-version=$(VERSION) -o postgres $(POSTGRES_BKI_SRCS)
.PHONY: install-data
diff --git a/src/backend/catalog/genbki.sh b/src/backend/catalog/genbki.sh
index d257d94db0c8ebd1e69709c8b5cdfc0be6876b6d..2ec896d299e863304e08a0c134786023ab923d46 100644
--- a/src/backend/catalog/genbki.sh
+++ b/src/backend/catalog/genbki.sh
@@ -11,7 +11,7 @@
#
#
# IDENTIFICATION
-# $PostgreSQL: pgsql/src/backend/catalog/genbki.sh,v 1.41 2007/01/05 22:19:24 momjian Exp $
+# $PostgreSQL: pgsql/src/backend/catalog/genbki.sh,v 1.42 2007/02/06 09:16:08 petere Exp $
#
# NOTES
# non-essential whitespace is removed from the generated file.
@@ -59,7 +59,7 @@ do
echo " $CMDNAME [ -I dir ] --set-version=VERSION -o prefix files..."
echo
echo "Options:"
- echo " -I path to postgres_ext.h and pg_config_manual.h files"
+ echo " -I path to pg_config_manual.h file"
echo " -o prefix of output files"
echo " --set-version PostgreSQL version number for initdb cross-check"
echo
@@ -106,10 +106,10 @@ TMPFILE="genbkitmp$$.c"
trap "rm -f $TMPFILE ${OUTPUT_PREFIX}.bki.$$ ${OUTPUT_PREFIX}.description.$$ ${OUTPUT_PREFIX}.shdescription.$$" 0 1 2 3 15
-# Get NAMEDATALEN from postgres_ext.h
+# Get NAMEDATALEN from pg_config_manual.h
for dir in $INCLUDE_DIRS; do
- if [ -f "$dir/postgres_ext.h" ]; then
- NAMEDATALEN=`grep '^#define[ ]*NAMEDATALEN' $dir/postgres_ext.h | $AWK '{ print $3 }'`
+ if [ -f "$dir/pg_config_manual.h" ]; then
+ NAMEDATALEN=`grep '^#define[ ]*NAMEDATALEN' $dir/pg_config_manual.h | $AWK '{ print $3 }'`
break
fi
done
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
index d41d5619966c5f1bf0161c00cdea46aa12b6464b..074833d1984d0816bcc307fb4a8b0a3c7ba53f92 100644
--- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h
@@ -6,7 +6,7 @@
* for developers. If you edit any of these, be sure to do a *full*
* rebuild (and an initdb if noted).
*
- * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.23 2006/09/18 22:40:40 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.24 2007/02/06 09:16:08 petere Exp $
*------------------------------------------------------------------------
*/
@@ -62,6 +62,15 @@
*/
#define XLOG_SEG_SIZE (16*1024*1024)
+/*
+ * Maximum length for identifiers (e.g. table names, column names,
+ * function names). It must be a multiple of sizeof(int) (typically
+ * 4).
+ *
+ * Changing this requires an initdb.
+ */
+#define NAMEDATALEN 64
+
/*
* Maximum number of arguments to a function.
*
diff --git a/src/include/postgres_ext.h b/src/include/postgres_ext.h
index efffad2c7ce4b1f91b4f638deea360d7ffd38aae..51a18b7dcc34fe13a8f8c98b1f4bf32cbef9870c 100644
--- a/src/include/postgres_ext.h
+++ b/src/include/postgres_ext.h
@@ -15,7 +15,7 @@
* use header files that are otherwise internal to Postgres to interface
* with the backend.
*
- * $PostgreSQL: pgsql/src/include/postgres_ext.h,v 1.16 2004/08/29 05:06:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/include/postgres_ext.h,v 1.17 2007/02/06 09:16:08 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -38,16 +38,6 @@ typedef unsigned int Oid;
/* you will need to include <limits.h> to use the above #define */
-/*
- * NAMEDATALEN is the max length for system identifiers (e.g. table names,
- * attribute names, function names, etc). It must be a multiple of
- * sizeof(int) (typically 4).
- *
- * NOTE that databases with different NAMEDATALEN's cannot interoperate!
- */
-#define NAMEDATALEN 64
-
-
/*
* Identifiers of error message fields. Kept here to keep common
* between frontend and backend, and also to export them to libpq
diff --git a/src/tools/msvc/genbki.pl b/src/tools/msvc/genbki.pl
index f69b8073a11b69bedadd25c54f9558e927435a48..7fd0bdd5e6b3194e06d0a5a1e53bee6afd82fe85 100755
--- a/src/tools/msvc/genbki.pl
+++ b/src/tools/msvc/genbki.pl
@@ -11,7 +11,7 @@
#
#
# IDENTIFICATION
-# $PostgreSQL: pgsql/src/tools/msvc/genbki.pl,v 1.2 2007/01/05 22:20:05 momjian Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/genbki.pl,v 1.3 2007/02/06 09:16:08 petere Exp $
#
#-------------------------------------------------------------------------
@@ -24,8 +24,8 @@ my $prefix = shift || Usage();
$version =~ /^(\d+\.\d+)/ || die "Bad format verison $version\n";
my $majorversion = $1;
-my $pgext = read_file("src/include/postgres_ext.h");
-$pgext =~ /^#define\s+NAMEDATALEN\s+(\d+)$/mg || die "Could not read NAMEDATALEN from postgres_ext.h\n";
+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");