Commit63d0139

committed

Remove crude test for log_statement_stats in startup code now that we

have a more proper GUC based test.Also change error return code to ERRCODE_INVALID_PARAMETER_VALUE so itmatches the old error return code.

1 parentae96e62 commit63d0139Copy full SHA for 63d0139

File tree

-16

lines changed

-16

lines changed

Lines changed: 1 addition & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.401 2004/04/25 18:23:56 neilc Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/postgres.c,v 1.402 2004/05/07 01:53:41 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -2533,18 +2533,6 @@ PostgresMain(int argc, char argv[], const char username)`
`2533`	`2533`	`on_proc_exit(log_disconnections,0);`
`2534`	`2534`	`}`
`2535`	`2535`
`2536`		`-/*`
`2537`		`- * Post-processing for command line options.`
`2538`		`- */`
`2539`		`-if (log_statement_stats&&`
`2540`		`-(log_parser_stats\|\|log_planner_stats\|\|log_executor_stats))`
`2541`		`-{`
`2542`		`-ereport(WARNING,`
`2543`		`-(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`2544`		`-errmsg("statement-level statistics are disabled because parser, planner, or executor statistics are on")));`
`2545`		`-SetConfigOption("log_statement_stats","false",ctx,gucsource);`
`2546`		`-}`
`2547`		`-`
`2548`	`2536`	`if (!IsUnderPostmaster\|\|ExecBackend)`
`2549`	`2537`	`{`
`2550`	`2538`	`if (!potential_DataDir)`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`* Written by Peter Eisentraut <peter_e@gmx.net>.`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.203 2004/05/07 01:34:08 momjian Exp $`
	`13`	`+ * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.204 2004/05/07 01:53:41 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*--------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -4720,7 +4720,7 @@ assign_stage_log_stats(bool newval, bool doit, GucSource source)`
`4720`	`4720`	`{`
`4721`	`4721`	`if (doit)`
`4722`	`4722`	`ereport(ERROR,`
`4723`		`-(errcode(ERRCODE_ERROR_IN_ASSIGNMENT),`
	`4723`	`+(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`4724`	`4724`	`errmsg("Can not enable parameter when \"log_statement_stats\" is true.")));`
`4725`	`4725`	`else`
`4726`	`4726`	`return false;`
`@@ -4740,7 +4740,7 @@ assign_log_stats(bool newval, bool doit, GucSource source)`
`4740`	`4740`	`{`
`4741`	`4741`	`if (doit)`
`4742`	`4742`	`ereport(ERROR,`
`4743`		`-(errcode(ERRCODE_ERROR_IN_ASSIGNMENT),`
	`4743`	`+(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`4744`	`4744`	`errmsg("Can not enable \"log_statement_stats\" when \"log_parser_stats\",\n"`
`4745`	`4745`	`"\"log_planner_stats\", or \"log_executor_stats\" is true.")));`
`4746`	`4746`	`else`

Comments

(0)