git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Propagate system identifier generation improvement into pg_resetxlog.

2014年5月28日 02:01:13 +0000 (22:01 -0400)

Commit 5035701e07e8bd395aa878465a102afd7b74e8c3 improved xlog.c's method
for creating a database system identifier, but I neglected to fix the
copy of that code appearing in pg_resetxlog.c. Spotted by Andres Freund.

src/bin/pg_resetxlog/pg_resetxlog.c patch | blob | blame | history

diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c

index 8671c0a4a3db5ae475634e9184b978c58a5c40d1..d11280e1d4d7319ef4e4764e6e04caf3394c3972 100644 (file)

--- a/src/bin/pg_resetxlog/pg_resetxlog.c

+++ b/src/bin/pg_resetxlog/pg_resetxlog.c

@@ -492,7 +492,8 @@ GuessControlValues(void)

gettimeofday(&tv, NULL);

sysidentifier = ((uint64) tv.tv_sec) << 32;

- sysidentifier |= (uint32) (tv.tv_sec | tv.tv_usec);

+ sysidentifier |= ((uint64) tv.tv_usec) << 12;

+ sysidentifier |= getpid() & 0xFFF;

ControlFile.system_identifier = sysidentifier;

This is the main PostgreSQL git repository.

RSS Atom