From 6d79d6027c61832cedf60757c83607495b3ee3a2 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 23 Mar 2000 23:16:49 +0000
Subject: [PATCH] >> 5. empty define that results in an empty but terminated
line ( ; ) easy (maybe dumb) fix for 5 in attachment define.patch
greetings, Andreas
---
doc/src/sgml/ref/lock.sgml | 10 +++++-----
src/backend/tcop/postgres.c | 6 ++++--
src/include/utils/ps_status.h | 4 ++--
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml
index 05948c059e6..051db61efde 100644
--- a/doc/src/sgml/ref/lock.sgml
+++ b/doc/src/sgml/ref/lock.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/lock.sgml,v 1.16 2000/03/23 22:25:35 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/lock.sgml,v 1.17 2000/03/23 23:16:47 momjian Exp $
Postgres documentation
-->
@@ -86,7 +86,7 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX
<term>Notes</term>
<listitem>
<para>
- If EXCLUSIVE or SHARE are not speicified, EXCLUSIVE is assumed.
+ If EXCLUSIVE or SHARE are not specified, EXCLUSIVE is assumed.
If ROW or ACCESS is not specified, the entire table is locked
for the duration of the transaction.
</para>
@@ -117,14 +117,14 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX
<note>
<para>
This lock mode is acquired automatically over tables being queried.
- This lock is released automatically after the statement completes.
+ It is released after the statement completes.
It does not remain for the duration of the transaction.
</para>
</note>
<para>
This is the least restrictive lock mode. It conflicts only with
- ACCESS EXCLUSIVE mode. It is intended to protect a table being
+ ACCESS EXCLUSIVE mode. It is used to protect a table being
modified by concurrent <command>ALTER TABLE</command>,
<command>DROP TABLE</command> and <command>VACUUM</command>
commands.
@@ -139,7 +139,7 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX
<para>
Automatically acquired by <command>SELECT...FOR UPDATE</command>.
While it is a shared lock, there is the intention to later upgrade
- this to an EXCLUSIVE lock.
+ this to a ROW EXCLUSIVE lock.
</para>
</note>
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 7d3aed5a834..a70418637f7 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.147 2000/03/01 02:39:46 ishii Exp $
+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.148 2000/03/23 23:16:48 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@@ -97,7 +97,9 @@
CommandDest whereToSendOutput = Debug;
/* Define status buffer needed by PS_SET_STATUS */
+#ifdef PS_DEFINE_BUFFER
PS_DEFINE_BUFFER;
+#endif
extern void BaseInit(void);
extern void StartupXLOG(void);
@@ -1503,7 +1505,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
- puts("$Revision: 1.147 $ $Date: 2000/03/01 02:39:46 $\n");
+ puts("$Revision: 1.148 $ $Date: 2000/03/23 23:16:48 $\n");
}
/*
diff --git a/src/include/utils/ps_status.h b/src/include/utils/ps_status.h
index 014105b2c80..0058e56ae3f 100644
--- a/src/include/utils/ps_status.h
+++ b/src/include/utils/ps_status.h
@@ -50,7 +50,7 @@ char *ps_status_buffer = NULL
extern char Ps_status_buffer[];
-#define PS_DEFINE_BUFFER
+#undef PS_DEFINE_BUFFER
#define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \
{ \
@@ -75,7 +75,7 @@ extern char Ps_status_buffer[];
#endif
#ifdef NO_PS_STATUS
-#define PS_DEFINE_BUFFER
+#undef PS_DEFINE_BUFFER
#define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname)
#define PS_CLEAR_STATUS()
#define PS_SET_STATUS(status) { if ((status)); }
--
GitLab