diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2022-06-10 16:34:25 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2022-06-10 16:34:25 -0400 |
| commit | f25b5519c99a68324b147dad15b68b1a3bd378ad (patch) | |
| tree | dfee3ac4d40576954fca41e0a62807eae049299c /src | |
| parent | 03fa84ac7c9239a18b7953d49acedd80f6aaccee (diff) | |
| download | postgresql-f25b5519c99a68324b147dad15b68b1a3bd378ad.tar.gz postgresql-f25b5519c99a68324b147dad15b68b1a3bd378ad.zip | |
Revert "Fix psql's single transaction mode on client-side errors with -c/-f switches".
This reverts commits a04ccf6df et al. in the back branches only.
There was some disagreement already over whether to back-patch
157f8739a, on the grounds that it is the sort of behavioral
change that we don't like to back-patch. Furthermore, it now
looks like the logic needs some more work, which we don't have
time for before the upcoming 14.4 release. Revert for now, and
perhaps reconsider later.
Discussion: https://postgr.es/m/17504-76b68018e130415e@postgresql.org
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/psql/startup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 9aa665d3258..110906a4e95 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -411,9 +411,7 @@ main(int argc, char *argv[]) if (options.single_txn) { - res = PSQLexec((successResult == EXIT_SUCCESS) ? - "COMMIT" : "ROLLBACK"); - if (res == NULL) + if ((res = PSQLexec("COMMIT")) == NULL) { if (pset.on_error_stop) { |