File tree 3 files changed +9
-7
lines changed
3 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -189,6 +189,7 @@ Complete list of usable sgml source files in this directory.
189
189
<!ENTITY values SYSTEM "values.sgml">
190
190
191
191
<!-- applications and utilities -->
192
+ <!ENTITY pgalterckey SYSTEM "pg_alterckey.sgml">
192
193
<!ENTITY clusterdb SYSTEM "clusterdb.sgml">
193
194
<!ENTITY createdb SYSTEM "createdb.sgml">
194
195
<!ENTITY createuser SYSTEM "createuser.sgml">
@@ -215,7 +216,7 @@ Complete list of usable sgml source files in this directory.
215
216
<!ENTITY pgtestfsync SYSTEM "pgtestfsync.sgml">
216
217
<!ENTITY pgtesttiming SYSTEM "pgtesttiming.sgml">
217
218
<!ENTITY pgupgrade SYSTEM "pgupgrade.sgml">
218
- <!ENTITY pgwaldump SYSTEM "pg_waldump.sgml">
219
+ <!ENTITY pgwaldump SYSTEM "pg_waldump.sgml">
219
220
<!ENTITY postgres SYSTEM "postgres-ref.sgml">
220
221
<!ENTITY postmaster SYSTEM "postmaster.sgml">
221
222
<!ENTITY psqlRef SYSTEM "psql-ref.sgml">
File renamed without changes.
Original file line number Diff line number Diff line change @@ -343,16 +343,17 @@ create_lockfile(void)
343
343
unlink (pid_path );
344
344
345
345
/* Sleep to reduce the likelihood of concurrent unlink */
346
- sleep ( 2 );
346
+ pg_usleep ( 2000000L ); /* 2 seconds */
347
347
}
348
348
349
349
/* Create our own lockfile? */
350
- lock_fd = open (pid_path , O_RDWR | O_CREAT | O_EXCL
351
- #ifdef WIN32
352
- /* delete on close */
353
- | O_TEMPORARY
350
+ #ifndef WIN32
351
+ lock_fd = open (pid_path , O_RDWR | O_CREAT | O_EXCL , pg_file_create_mode );
352
+ #else
353
+ /* delete on close */
354
+ lock_fd = open (pid_path , O_RDWR | O_CREAT | O_EXCL | O_TEMPORARY ,
355
+ pg_file_create_mode );
354
356
#endif
355
- , pg_file_create_mode );
356
357
357
358
if (lock_fd == -1 )
358
359
{
You can’t perform that action at this time.
0 commit comments