diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index d09b6706dd..5d2b382419 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -1,5 +1,5 @@
@@ -57,7 +57,7 @@ COPY table [ ( column list
+ column
An optional list of columns to be copied. If no column list is
@@ -99,7 +99,8 @@ COPY table [ ( table [ ( delimiter
- The character that separates fields within each row (line) of the file.
+ The single character that separates fields within each row (line) of the file.
@@ -189,9 +190,7 @@ ERROR: reasonCOPY moves data between
PostgreSQL tables and standard file-system
- files.
-
- COPY TO copies the entire contents of a table
+ files. COPY TO copies the contents of a table
to a file, while COPY FROM copies
data from a file to a table (appending the data to
whatever is in the table already).
@@ -200,7 +199,7 @@ ERROR: reason
If a list of columns is specified, COPY will
only copy the data in the specified columns to or from the file.
- If there are any columns in the table that are not in the file,
+ If there are any columns in the table that are not in the column list,
COPY FROM will insert the default values for
those columns.
@@ -249,8 +248,8 @@ ERROR: reason
By default, a text copy uses a tab ("\t") character as a delimiter
between fields. The field delimiter may be changed to any other
- single character with the keyword DELIMITER. Characters in data
- fields that happen to match the delimiter character will be
+ single character with the keyword . Characters
+ in data fields that happen to match the delimiter character will be
backslash quoted.
@@ -635,15 +634,14 @@ OIDs to be shown as NULL if that ever proves desirable.
Usage
-The following example copies a table to standard output,
- using a vertical bar (|) as the field
- delimiter:
+ The following example copies a table to standard output,
+ using a vertical bar (|) as the field delimiter:
COPY country TO stdout WITH DELIMITER '|';
- To copy data from a Unix file into a table country:
+ To copy data from a Unix file into the country table:
COPY country FROM '/usr1/proj/bray/sql/country_data';
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index 359fb85b2e..02fe51f695 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -1,5 +1,5 @@
@@ -404,7 +404,8 @@ SELECT setseed(value);
- ERROR: not a valid option name: name
+ ERROR: 'name is not a
+ valid option name
The parameter you tried to set does not exist.
@@ -413,7 +414,8 @@ SELECT setseed(value);
- ERROR: permission denied
+ ERROR: 'name':
+ permission denied
You must be a superuser to alter certain settings.
@@ -422,7 +424,8 @@ SELECT setseed(value);
- ERROR: name can only be set at start-up
+ ERROR: 'name' cannot
+ be changed after server start
Some parameters are fixed once the server is started.
diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml
index ad5565cf05..53d0772ab0 100644
--- a/doc/src/sgml/ref/show.sgml
+++ b/doc/src/sgml/ref/show.sgml
@@ -1,5 +1,5 @@
@@ -54,7 +54,11 @@ SHOW ALL
SHOW will display the current setting of a
run-time parameter. These variables can be set using the
- SET statement or are determined at session start.
+ SET statement, by editing the
+ postgresql.conf, through the
+ PGOPTIONS environmental variable, or through a
+ command-line flag when starting the
+ postmaster.
@@ -64,10 +68,11 @@ SHOW ALL
- ERROR: not a valid option name: name
+ ERROR: Option 'name'
+ is not recognized
- Message returned if variable does
+ Message returned if name does
not stand for an existing parameter.
@@ -81,24 +86,25 @@ SHOW ALL
Show the current DateStyle setting:
-
+
SHOW DateStyle;
DateStyle
---------------------------------------
ISO with US (NonEuropean) conventions
(1 row)
-
+
Show the current genetic optimizer (geqo) setting:
+
SHOW GEQO;
geqo
------
on
(1 row)
-
+
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 58bd1ef69b..7da055179d 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -16,7 +16,7 @@
*
* Copyright (c) 2001, PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v 1.22 2002/07/20 05:16:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v 1.23 2002/08/04 05:09:36 momjian Exp $
* ----------
*/
#include "postgres.h"
@@ -382,10 +382,9 @@ pgstat_beterm(int pid)
if (pgStatSock < 0)
return;
+ MemSet(&(msg.m_hdr), 0, sizeof(msg.m_hdr));
msg.m_hdr.m_type = PGSTAT_MTYPE_BETERM;
- msg.m_hdr.m_backendid = 0;
msg.m_hdr.m_procpid = pid;
- msg.m_hdr.m_databaseid = 0;
pgstat_send(&msg, sizeof(msg));
}