File tree Expand file tree Collapse file tree 3 files changed +9
-7
lines changed Expand file tree Collapse file tree 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.
189189<!ENTITY values SYSTEM "values.sgml">
190190
191191<!-- applications and utilities -->
192+ <!ENTITY pgalterckey SYSTEM "pg_alterckey.sgml">
192193<!ENTITY clusterdb SYSTEM "clusterdb.sgml">
193194<!ENTITY createdb SYSTEM "createdb.sgml">
194195<!ENTITY createuser SYSTEM "createuser.sgml">
@@ -215,7 +216,7 @@ Complete list of usable sgml source files in this directory.
215216<!ENTITY pgtestfsync SYSTEM "pgtestfsync.sgml">
216217<!ENTITY pgtesttiming SYSTEM "pgtesttiming.sgml">
217218<!ENTITY pgupgrade SYSTEM "pgupgrade.sgml">
218- <!ENTITY pgwaldump SYSTEM "pg_waldump.sgml">
219+ <!ENTITY pgwaldump SYSTEM "pg_waldump.sgml">
219220<!ENTITY postgres SYSTEM "postgres-ref.sgml">
220221<!ENTITY postmaster SYSTEM "postmaster.sgml">
221222<!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)
343343 unlink (pid_path );
344344
345345 /* Sleep to reduce the likelihood of concurrent unlink */
346- sleep ( 2 );
346+ pg_usleep ( 2000000L ); /* 2 seconds */
347347 }
348348
349349 /* 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 );
354356#endif
355- , pg_file_create_mode );
356357
357358 if (lock_fd == -1 )
358359 {
You can’t perform that action at this time.
0 commit comments