Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6d79d60

Browse files
committed
>> 5. empty define that results in an empty but terminated line ( ; )
easy (maybe dumb) fix for 5 in attachment define.patchgreetings, Andreas
1 parentf864501 commit6d79d60

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

‎doc/src/sgml/ref/lock.sgml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/lock.sgml,v 1.16 2000/03/2322:25:35 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/lock.sgml,v 1.17 2000/03/2323:16:47 momjian Exp $
33
Postgres documentation
44
-->
55

@@ -86,7 +86,7 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX
8686
<term>Notes</term>
8787
<listitem>
8888
<para>
89-
If EXCLUSIVE or SHARE are notspeicified, EXCLUSIVE is assumed.
89+
If EXCLUSIVE or SHARE are notspecified, EXCLUSIVE is assumed.
9090
If ROW or ACCESS is not specified, the entire table is locked
9191
for the duration of the transaction.
9292
</para>
@@ -117,14 +117,14 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX
117117
<note>
118118
<para>
119119
This lock mode is acquired automatically over tables being queried.
120-
This lockis released automatically after the statement completes.
120+
Itis released after the statement completes.
121121
It does not remain for the duration of the transaction.
122122
</para>
123123
</note>
124124

125125
<para>
126126
This is the least restrictive lock mode. It conflicts only with
127-
ACCESS EXCLUSIVE mode. It isintended to protect a table being
127+
ACCESS EXCLUSIVE mode. It isused to protect a table being
128128
modified by concurrent <command>ALTER TABLE</command>,
129129
<command>DROP TABLE</command> and <command>VACUUM</command>
130130
commands.
@@ -139,7 +139,7 @@ LOCK [ TABLE ] <replaceable class="PARAMETER">name</replaceable> IN SHARE ROW EX
139139
<para>
140140
Automatically acquired by <command>SELECT...FOR UPDATE</command>.
141141
While it is a shared lock, there is the intention to later upgrade
142-
this toan EXCLUSIVE lock.
142+
this toa ROW EXCLUSIVE lock.
143143
</para>
144144
</note>
145145

‎src/backend/tcop/postgres.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.147 2000/03/01 02:39:46 ishii Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.148 2000/03/23 23:16:48 momjian Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -97,7 +97,9 @@
9797
CommandDestwhereToSendOutput=Debug;
9898

9999
/* Define status buffer needed by PS_SET_STATUS */
100+
#ifdefPS_DEFINE_BUFFER
100101
PS_DEFINE_BUFFER;
102+
#endif
101103

102104
externvoidBaseInit(void);
103105
externvoidStartupXLOG(void);
@@ -1503,7 +1505,7 @@ PostgresMain(int argc, char *argv[], int real_argc, char *real_argv[])
15031505
if (!IsUnderPostmaster)
15041506
{
15051507
puts("\nPOSTGRES backend interactive interface ");
1506-
puts("$Revision: 1.147 $ $Date: 2000/03/01 02:39:46 $\n");
1508+
puts("$Revision: 1.148 $ $Date: 2000/03/23 23:16:48 $\n");
15071509
}
15081510

15091511
/*

‎src/include/utils/ps_status.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ char *ps_status_buffer = NULL
5050

5151
externcharPs_status_buffer[];
5252

53-
#definePS_DEFINE_BUFFER
53+
#undef PS_DEFINE_BUFFER
5454

5555
#definePS_INIT_STATUS(argc,argv,execname,username,hostname,dbname) \
5656
{ \
@@ -75,7 +75,7 @@ extern char Ps_status_buffer[];
7575
#endif
7676

7777
#ifdefNO_PS_STATUS
78-
#definePS_DEFINE_BUFFER
78+
#undef PS_DEFINE_BUFFER
7979
#definePS_INIT_STATUS(argc,argv,execname,username,hostname,dbname)
8080
#definePS_CLEAR_STATUS()
8181
#definePS_SET_STATUS(status) { if ((status)); }

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp