Fix pgbench's failure to honor the documented long-form option "--builtin".

tglsfdc · tglsfdc · commit 0e2c85d130b8 · 2017-03-07T11:36:35.000-05:00
Not only did it not accept --builtin as a synonym for -b, but what it did accept as a synonym was --tpc-b (huh?), which it got even further wrong by marking as no_argument, so that if you did try that you got a core dump. I suppose this is leftover from some early design for the new switches added by commit 8bea3d2, but it's still pretty sloppy work. Per bug #14580 from Stepan Pesternikov. Back-patch to 9.6 where the error was introduced. Report: https://postgr.es/m/20170307123347.25054.73207@wrigleys.postgresql.org
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
@@ -3369,7 +3369,7 @@ main(int argc, char **argv)
 {
 	static struct option long_options[] = {
 		/* systematic long/short named options */
-		{"tpc-b", no_argument, NULL, 'b'},
+		{"builtin", required_argument, NULL, 'b'},
 		{"client", required_argument, NULL, 'c'},
 		{"connect", no_argument, NULL, 'C'},
 		{"debug", no_argument, NULL, 'd'},

Original file line number	Diff line number	Diff line change
`@@ -3369,7 +3369,7 @@ main(int argc, char **argv)`
`3369`	`3369`	`{`
`3370`	`3370`	`static struct option long_options[] = {`
`3371`	`3371`	`/* systematic long/short named options */`
`3372`		`- {"tpc-b", no_argument, NULL, 'b'},`
	`3372`	`+ {"builtin", required_argument, NULL, 'b'},`
`3373`	`3373`	`{"client", required_argument, NULL, 'c'},`
`3374`	`3374`	`{"connect", no_argument, NULL, 'C'},`
`3375`	`3375`	`{"debug", no_argument, NULL, 'd'},`