Commit28e858c

committed

Improve documentation and GUC description for transaction_timeout

Reported-by: Alexander Lakhin

1 parenta661bf7 commit28e858cCopy full SHA for 28e858c

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9167,7 +9167,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;`
`9167`	`9167`	`<listitem>`
`9168`	`9168`	`<para>`
`9169`	`9169`	`Terminate any session that spans longer than the specified amount of`
`9170`		`- time inthe transaction. The limit applies both to explicit transactions`
	`9170`	`+ time ina transaction. The limit applies both to explicit transactions`
`9171`	`9171`	`(started with <command>BEGIN</command>) and to an implicitly started`
`9172`	`9172`	`transaction corresponding to a single statement.`
`9173`	`9173`	`If this value is specified without units, it is taken as milliseconds.`
`@@ -9177,7 +9177,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;`
`9177`	`9177`	`<para>`
`9178`	`9178`	`If <varname>transaction_timeout</varname> is shorter or equal to`
`9179`	`9179`	`<varname>idle_in_transaction_session_timeout</varname> or <varname>statement_timeout</varname>`
`9180`		`-<varname>transaction_timeout</varname> will invalidatethe longer timeout.`
	`9180`	`+then the longer timeout is ignored.`
`9181`	`9181`	`</para>`
`9182`	`9182`
`9183`	`9183`	`<para>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2589,7 +2589,7 @@ struct config_int ConfigureNamesInt[] =`
`2589`	`2589`
`2590`	`2590`	`{`
`2591`	`2591`	`{"transaction_timeout",PGC_USERSET,CLIENT_CONN_STATEMENT,`
`2592`		`-gettext_noop("Sets the maximum allowedtime in a transactionwith a session (not a prepared transaction)."),`
	`2592`	`+gettext_noop("Sets the maximum allowedduration of any transactionwithin a session (not a prepared transaction)."),`
`2593`	`2593`	`gettext_noop("A value of 0 turns off the timeout."),`
`2594`	`2594`	`GUC_UNIT_MS`
`2595`	`2595`	`},`

Comments

(0)