Prevent BLCKSZ < 1024, and have initdb test shared buffers based on the

BLCKSZ value.

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 3001e325b2a80c91a979a0feac97263bb748c3d8..b0a875234aa7f4d925fc38c1876e8de74a5c9e11 100644 (file)
--- 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.134 2007/02/20 23:49:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1208,7 +1208,8 @@ test_config_settings(void)
 
        for (i = 0; i < bufslen; i++)
        {
-               test_buffs = trial_bufs[i];
+               /* Use same amount of memory, independent of BLCKSZ */
+               test_buffs = (trial_bufs[i] * 8192) / BLCKSZ;
                if (test_buffs <= ok_buffers)
                {
                        test_buffs = ok_buffers;

diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
index 074833d1984d0816bcc307fb4a8b0a3c7ba53f92..fba9ffac2359f2e3fd6952b48091b3c3079ba617 100644 (file)
--- 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.24 2007/02/06 09:16:08 petere Exp $
+ * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.25 2007/02/20 23:49:38 momjian Exp $
  *------------------------------------------------------------------------
  */
 
@@ -25,6 +25,10 @@
  */
 #define BLCKSZ 8192
 
+#if BLCKSZ < 1024
+#error BLCKSZ must be >= 1024
+#endif
+
 /*
  * RELSEG_SIZE is the maximum number of blocks allowed in one disk
  * file.  Thus, the maximum size of a single file is RELSEG_SIZE *