pg_restore -jN does not equate "multiple jobs", so partly revert the

alvherre · alvherre · commit 14a4f6f3748d · 2009-04-14T00:06:35.000Z
previous patch.

Per note from Tom.
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
@@ -34,7 +34,7 @@
  *
  *
  * IDENTIFICATION
- *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.98 2009/04/13 21:03:36 alvherre Exp $
+ *		$PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.99 2009/04/14 00:06:35 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -316,7 +316,7 @@ main(int argc, char **argv)
 	/* Can't do single-txn mode with multiple connections */
 	if (opts->single_txn && opts->number_of_jobs > 1)
 	{
-		fprintf(stderr, _("%s: options -1/--single-transaction and -j/--jobs cannot be used together\n"),
+		fprintf(stderr, _("%s: cannot specify both --single-transaction and multiple jobs\n"),
 				progname);
 		exit(1);
 	}

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`*`
`35`	`35`	`*`
`36`	`36`	`* IDENTIFICATION`
`37`		`- * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.98 2009/04/13 21:03:36 alvherre Exp $`
	`37`	`+ * $PostgreSQL: pgsql/src/bin/pg_dump/pg_restore.c,v 1.99 2009/04/14 00:06:35 alvherre Exp $`
`38`	`38`	`*`
`39`	`39`	`*-------------------------------------------------------------------------`
`40`	`40`	`*/`
`@@ -316,7 +316,7 @@ main(int argc, char **argv)`
`316`	`316`	`/* Can't do single-txn mode with multiple connections */`
`317`	`317`	`if (opts->single_txn && opts->number_of_jobs > 1)`
`318`	`318`	`{`
`319`		`- fprintf(stderr, _("%s: options -1/--single-transaction and -j/--jobs cannot be used together\n"),`
	`319`	`+ fprintf(stderr, _("%s: cannot specify both --single-transaction and multiple jobs\n"),`
`320`	`320`	`progname);`
`321`	`321`	`exit(1);`
`322`	`322`	`}`