diff options
| author | Alexander Korotkov <akorotkov@postgresql.org> | 2020-04-08 11:37:27 +0300 |
|---|---|---|
| committer | Alexander Korotkov <akorotkov@postgresql.org> | 2020-04-08 11:37:27 +0300 |
| commit | 1aac32df89eb19949050f6f27c268122833ad036 (patch) | |
| tree | 7f1b7d61e1bdb19a5f9437d5198b63e4be4e2ecb /doc/src | |
| parent | 02a2e8b442002a698336954633b0ccc4e30061e6 (diff) | |
| download | postgresql-1aac32df89eb19949050f6f27c268122833ad036.tar.gz postgresql-1aac32df89eb19949050f6f27c268122833ad036.zip | |
Revert 0f5ca02f53
0f5ca02f53 introduces 3 new keywords. It appears to be too much for relatively
small feature. Given now we past feature freeze, it's already late for
discussion of the new syntax. So, revert.
Discussion: https://postgr.es/m/28209.1586294824%40sss.pgh.pa.us
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/ref/begin.sgml | 17 | ||||
| -rw-r--r-- | doc/src/sgml/ref/start_transaction.sgml | 17 |
2 files changed, 2 insertions, 32 deletions
diff --git a/doc/src/sgml/ref/begin.sgml b/doc/src/sgml/ref/begin.sgml index 66d9ad7cb23..c23bbfb4e71 100644 --- a/doc/src/sgml/ref/begin.sgml +++ b/doc/src/sgml/ref/begin.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</replaceable> [, ...] ] [ WAIT FOR LSN <replaceable class="parameter">lsn_value</replaceable> [TIMEOUT <replaceable class="parameter">number_of_milliseconds</replaceable> ] ] +BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</replaceable> [, ...] ] <phrase>where <replaceable class="parameter">transaction_mode</replaceable> is one of:</phrase> @@ -63,17 +63,6 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</ <xref linkend="sql-set-transaction"/> was executed. </para> - - <para> - The <literal>WAIT FOR</literal> clause allows to wait for the target log - sequence number (<acronym>LSN</acronym>) to be replayed on standby before - starting the transaction in <productname>PostgreSQL</productname> databases - with master-standby asynchronous replication. Wait time can be limited by - specifying a timeout, which is measured in milliseconds and must be a positive - integer. If <acronym>LSN</acronym> was not reached before timeout, transaction - doesn't begin. Waiting can be interrupted by cancelling - <literal>BEGIN</literal> command. - </para> </refsect1> <refsect1> @@ -157,10 +146,6 @@ BEGIN; different purpose in embedded SQL. You are advised to be careful about the transaction semantics when porting database applications. </para> - - <para> - There is no <literal>WAIT FOR</literal> clause in the SQL standard. - </para> </refsect1> <refsect1> diff --git a/doc/src/sgml/ref/start_transaction.sgml b/doc/src/sgml/ref/start_transaction.sgml index b94ab00b403..d6cd1d41779 100644 --- a/doc/src/sgml/ref/start_transaction.sgml +++ b/doc/src/sgml/ref/start_transaction.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation <refsynopsisdiv> <synopsis> -START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable> [, ...] ] [ WAIT FOR LSN <replaceable class="parameter">lsn_value</replaceable> [TIMEOUT <replaceable class="parameter">number_of_milliseconds</replaceable> ] ] +START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable> [, ...] ] <phrase>where <replaceable class="parameter">transaction_mode</replaceable> is one of:</phrase> @@ -40,17 +40,6 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable characteristics, as if <xref linkend="sql-set-transaction"/> was executed. This is the same as the <xref linkend="sql-begin"/> command. </para> - - <para> - The <literal>WAIT FOR</literal> clause allows to wait for the target log - sequence number (<acronym>LSN</acronym>) to be replayed on standby before - starting the transaction in <productname>PostgreSQL</productname> databases - with master-standby asynchronous replication. Wait time can be limited by - specifying a timeout, which is measured in milliseconds and must be a positive - integer. If <acronym>LSN</acronym> was not reached before timeout, transaction - doesn't begin. Waiting can be interrupted by cancelling - <literal>START TRANSACTION</literal> command. - </para> </refsect1> <refsect1> @@ -90,10 +79,6 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable </para> <para> - There is no <literal>WAIT FOR</literal> clause in the SQL standard. - </para> - - <para> See also the compatibility section of <xref linkend="sql-set-transaction"/>. </para> </refsect1> |