Revert optimizer page count change.

diff --git a/doc/src/sgml/perform.sgml b/doc/src/sgml/perform.sgml
index 2e42d020e420fe596ddcd7ad8c120e40863d7993..af7f855a50cdd569b84b7c6d97ebbfe4ca6c097b 100644 (file)
--- a/doc/src/sgml/perform.sgml
+++ b/doc/src/sgml/perform.sgml
@@ -1,5 +1,5 @@
 
 
  
@@ -109,8 +109,8 @@ regression=# EXPLAIN SELECT * FROM tenk1;
 SELECT * FROM pg_class WHERE relname = 'tenk1';
 
 
-    you will find out that tenk1 has 333 disk
-    pages and 10000 rows.  So the cost is estimated at 333 page
+    you will find out that tenk1 has 233 disk
+    pages and 10000 rows.  So the cost is estimated at 233 page
     reads, defined as costing 1.0 apiece, plus 10000 * cpu_tuple_cost which is
     currently 0.01 (try SHOW cpu_tuple_cost).
    

diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index 2e7d63024b7f9305ba80b6cf1c5114cea8931c3c..4f4ef3f4554a612ed05302565cbfbc4ca47a7f5b 100644 (file)
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -121,7 +121,8 @@
                #   panic
 #client_min_messages = notice  # Values, in order of decreasing detail:
                #   debug5, debug4, debug3, debug2, debug1,
-               #   log, info, notice, warning, error
+               #   log, info, notice, warning, error, 
+               #   panic(off)
 #silent_mode = false
 
 #log_connections = false