aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gustafsson <dgustafsson@postgresql.org>2021-08-18 11:23:43 +0200
committerDaniel Gustafsson <dgustafsson@postgresql.org>2021-08-18 11:23:43 +0200
commit5310c61ecc14f23d28429f055c968a97d5e8b39c (patch)
tree43954ce421e317350c6fe2c2fdf39fafc12b5153
parent8f51ee63df3a9022cfd07d7482b8f3f21ff8f46d (diff)
downloadpostgresql-5310c61ecc14f23d28429f055c968a97d5e8b39c.tar.gz
postgresql-5310c61ecc14f23d28429f055c968a97d5e8b39c.zip
Fix pg_amcheck --skip option parameter handling
The skip options set for all-visible and all-frozen were incorrect as they used space rather than hyphen, causing a syntax error when invoked. Also, the option for not skipping any pages at all, none, was documented but not implemented. Backpatch through 14 where pg_amcheck was introduced. Bug: #17149 Reported-by: Chen Jiaoqian <chenjq.jy@fujitsu.com> Reviewed-by: Masahiko Sawada <sawada.mshk@gmail.com> Discussion: https://postgr.es/m/17149-5918ea748da36b15@postgresql.org Backpatch-through: 14
-rw-r--r--src/bin/pg_amcheck/pg_amcheck.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/bin/pg_amcheck/pg_amcheck.c b/src/bin/pg_amcheck/pg_amcheck.c
index 406fedaab14..e6ea8e6e5d0 100644
--- a/src/bin/pg_amcheck/pg_amcheck.c
+++ b/src/bin/pg_amcheck/pg_amcheck.c
@@ -397,9 +397,11 @@ main(int argc, char *argv[])
break;
case 6:
if (pg_strcasecmp(optarg, "all-visible") == 0)
- opts.skip = "all visible";
+ opts.skip = "all-visible";
else if (pg_strcasecmp(optarg, "all-frozen") == 0)
- opts.skip = "all frozen";
+ opts.skip = "all-frozen";
+ else if (pg_strcasecmp(optarg, "none") == 0)
+ opts.skip = "none";
else
{
pg_log_error("invalid argument for option %s", "--skip");