Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit a19f64e

Browse files
author
Maksim Milyutin
committed
change input of multixact-offset parameter of initdb to decimal format
1 parent 6495714 commit a19f64e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/backend/bootstrap/bootstrap.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,9 @@ AuxiliaryProcessMain(int argc, char *argv[])
257257
}
258258
break;
259259
case 'o':
260-
if (sscanf(optarg, "%lx", &start_mx_offset) != 1)
260+
if (sscanf(optarg, "%ld", &start_mx_offset) != 1)
261261
{
262-
fprintf(stderr, "%s: invalid hex value of multixact-offset\n", progname);
262+
fprintf(stderr, "%s: invalid decimal value of multixact-offset\n", progname);
263263
exit(1);
264264
}
265265
break;

src/bin/initdb/initdb.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,7 +1538,7 @@ bootstrap_template1(void)
15381538
unsetenv("PGCLIENTENCODING");
15391539

15401540
snprintf(cmd, sizeof(cmd),
1541-
"\"%s\" --boot -x1 %s %s %lx %s %lx %s %lx %s %s",
1541+
"\"%s\" --boot -x1 %s %s %lx %s %lx %s %ld %s %s",
15421542
backend_exec,
15431543
data_checksums ? "-k" : "",
15441544
"-X", start_xid,
@@ -2705,7 +2705,7 @@ usage(const char *progname)
27052705
printf(_(" -n, --noclean do not clean up after errors\n"));
27062706
printf(_(" -N, --nosync do not wait for changes to be written safely to disk\n"));
27072707
printf(_(" -o, --multixact-offset=START_MX_OFFSET\n"
2708-
" specify start multixact offset value in hex format for new db instance\n"
2708+
" specify start multixact offset value in decimal format for new db instance\n"
27092709
" to test 64-bit xids, default value is 0\n"));
27102710
printf(_(" -s, --show show internal settings\n"));
27112711
printf(_(" -S, --sync-only only sync data directory\n"));
@@ -3483,9 +3483,9 @@ main(int argc, char *argv[])
34833483
do_sync = false;
34843484
break;
34853485
case 'o':
3486-
if (sscanf(optarg, "%lx", &start_mx_offset) != 1)
3486+
if (sscanf(optarg, "%ld", &start_mx_offset) != 1)
34873487
{
3488-
fprintf(stderr, "%s: invalid hex value of multixact-offset\n", progname);
3488+
fprintf(stderr, "%s: invalid decimal value of multixact-offset\n", progname);
34893489
exit(1);
34903490
}
34913491
break;

0 commit comments

Comments
 (0)