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

Message fixes

Browse Source
This commit is contained in:
Alvaro Herrera 2019-04-29 10:05:07 -04:00
parent cd3e27464c
commit ffbce803e6
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/pg_checksums/pg_checksums.c
View File

@ -228,14 +228,14 @@ scan_file(const char *fn, BlockNumber segmentno)
/* Seek back to beginning of block */ /* Seek back to beginning of block */
if (lseek(f, -BLCKSZ, SEEK_CUR) < 0) if (lseek(f, -BLCKSZ, SEEK_CUR) < 0)
{ {
pg_log_error("seek failed for block %d in file \"%s\": %m", blockno, fn); pg_log_error("seek failed for block %u in file \"%s\": %m", blockno, fn);
exit(1); exit(1);
} }
/* Write block with checksum */ /* Write block with checksum */
if (write(f, buf.data, BLCKSZ) != BLCKSZ) if (write(f, buf.data, BLCKSZ) != BLCKSZ)
{ {
pg_log_error("could not update checksum of block %d in file \"%s\": %m", pg_log_error("could not update checksum of block %u in file \"%s\": %m",
blockno, fn); blockno, fn);
exit(1); exit(1);
} }

4
src/bin/pg_rewind/pg_rewind.c
View File

@ -73,8 +73,8 @@ usage(const char *progname)
printf(_(" --source-pgdata=DIRECTORY source data directory to synchronize with\n")); printf(_(" --source-pgdata=DIRECTORY source data directory to synchronize with\n"));
printf(_(" --source-server=CONNSTR source server to synchronize with\n")); printf(_(" --source-server=CONNSTR source server to synchronize with\n"));
printf(_(" -n, --dry-run stop before modifying anything\n")); printf(_(" -n, --dry-run stop before modifying anything\n"));
printf(_(" -N, --no-sync do not wait for changes to be written\n")); printf(_(" -N, --no-sync do not wait for changes to be written\n"
printf(_(" safely to disk\n")); " safely to disk\n"));
printf(_(" -P, --progress write progress messages\n")); printf(_(" -P, --progress write progress messages\n"));
printf(_(" --debug write a lot of debug messages\n")); printf(_(" --debug write a lot of debug messages\n"));
printf(_(" -V, --version output version information, then exit\n")); printf(_(" -V, --version output version information, then exit\n"));

2
src/bin/pg_upgrade/check.c
View File

@ -901,7 +901,7 @@ check_for_tables_with_oids(ClusterInfo *cluster)
bool found = false; bool found = false;
char output_path[MAXPGPATH]; char output_path[MAXPGPATH];
prep_status("Checking for tables WITH OIDs"); prep_status("Checking for tables WITH OIDS");
snprintf(output_path, sizeof(output_path), snprintf(output_path, sizeof(output_path),
"tables_with_oids.txt"); "tables_with_oids.txt");

16
src/bin/scripts/vacuumdb.c
View File

@ -409,30 +409,30 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
if (vacopts->disable_page_skipping && PQserverVersion(conn) < 90600) if (vacopts->disable_page_skipping && PQserverVersion(conn) < 90600)
{ {
PQfinish(conn); PQfinish(conn);
pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL 9.6", pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
"disable-page-skipping"); "disable-page-skipping", "9.6");
exit(1); exit(1);
} }
if (vacopts->skip_locked && PQserverVersion(conn) < 120000) if (vacopts->skip_locked && PQserverVersion(conn) < 120000)
{ {
PQfinish(conn); PQfinish(conn);
pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL 12", pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
"skip-locked"); "skip-locked", "12");
exit(1); exit(1);
} }
if (vacopts->min_xid_age != 0 && PQserverVersion(conn) < 90600) if (vacopts->min_xid_age != 0 && PQserverVersion(conn) < 90600)
{ {
pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL 9.6", pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
"--min-xid-age"); "--min-xid-age", "9.6");
exit(1); exit(1);
} }
if (vacopts->min_mxid_age != 0 && PQserverVersion(conn) < 90600) if (vacopts->min_mxid_age != 0 && PQserverVersion(conn) < 90600)
{ {
pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL 9.6", pg_log_error("cannot use the \"%s\" option on server versions older than PostgreSQL %s",
"--min-mxid-age"); "--min-mxid-age", "9.6");
exit(1); exit(1);
} }