mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

>> 5. empty define that results in an empty but terminated line ( ; )

Browse Source 
easy (maybe dumb) fix for 5 in attachment define.patch

greetings, Andreas
This commit is contained in:
Bruce Momjian 2000-03-23 23:16:49 +00:00
parent f8645018bc
commit 6d79d6027c
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/src/sgml/ref/lock.sgml
View File

@ -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 Postgres documentation
--> -->
@ -86,7 +86,7 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX
<term>Notes</term> <term>Notes</term>
<listitem> <listitem>
<para> <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 If ROW or ACCESS is not specified, the entire table is locked
for the duration of the transaction. for the duration of the transaction.
</para> </para>
@ -117,14 +117,14 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX
<note> <note>
<para> <para>
This lock mode is acquired automatically over tables being queried. 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. It does not remain for the duration of the transaction.
</para> </para>
</note> </note>
<para> <para>
This is the least restrictive lock mode. It conflicts only with 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>, modified by concurrent <command>ALTER TABLE</command>,
<command>DROP TABLE</command> and <command>VACUUM</command> <command>DROP TABLE</command> and <command>VACUUM</command>
commands. commands.
@ -139,7 +139,7 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX
<para> <para>
Automatically acquired by <command>SELECT...FOR UPDATE</command>. Automatically acquired by <command>SELECT...FOR UPDATE</command>.
While it is a shared lock, there is the intention to later upgrade 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> </para>
</note> </note>

6
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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 * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -97,7 +97,9 @@
CommandDest whereToSendOutput = Debug; CommandDest whereToSendOutput = Debug;
/* Define status buffer needed by PS_SET_STATUS */ /* Define status buffer needed by PS_SET_STATUS */
#ifdef PS_DEFINE_BUFFER
PS_DEFINE_BUFFER; PS_DEFINE_BUFFER;
#endif
extern void BaseInit(void); extern void BaseInit(void);
extern void StartupXLOG(void); extern void StartupXLOG(void);
@ -1503,7 +1505,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); 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");
} }
/* /*

4
src/include/utils/ps_status.h
View File

@ -50,7 +50,7 @@ char *ps_status_buffer = NULL
extern char Ps_status_buffer[]; extern char Ps_status_buffer[];
#define PS_DEFINE_BUFFER #undef PS_DEFINE_BUFFER
#define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \ #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) \
{ \ { \
@ -75,7 +75,7 @@ extern char Ps_status_buffer[];
#endif #endif
#ifdef NO_PS_STATUS #ifdef NO_PS_STATUS
#define PS_DEFINE_BUFFER #undef PS_DEFINE_BUFFER
#define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname) #define PS_INIT_STATUS(argc, argv, execname, username, hostname, dbname)
#define PS_CLEAR_STATUS() #define PS_CLEAR_STATUS()
#define PS_SET_STATUS(status) { if ((status)); } #define PS_SET_STATUS(status) { if ((status)); }