mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-02 21:36:52 +02:00
Accept subsequent commits. This should have been just a warning anyway. I
cannot see a reason why it should be an error.
This commit is contained in:
parent
85bc36158d
commit
2ab3a88879
@ -1207,5 +1207,9 @@ Sat Jan 12 22:04:02 CET 2002
|
|||||||
- Fixed variable handling for struct members.
|
- Fixed variable handling for struct members.
|
||||||
- Removed check for array input. An attribut might store the
|
- Removed check for array input. An attribut might store the
|
||||||
complete array.
|
complete array.
|
||||||
|
|
||||||
|
Fri Jan 18 16:49:02 CET 2002
|
||||||
|
|
||||||
|
- Accept subsequent commits.
|
||||||
- Set ecpg version to 2.9.0.
|
- Set ecpg version to 2.9.0.
|
||||||
- Set library version to 3.3.0.
|
- Set library version to 3.3.0.
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.11 2001/12/23 12:17:41 meskes Exp $ */
|
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.12 2002/01/18 15:51:00 meskes Exp $ */
|
||||||
|
|
||||||
#include "postgres_fe.h"
|
#include "postgres_fe.h"
|
||||||
|
|
||||||
@ -90,12 +90,17 @@ ECPGtrans(int lineno, const char *connection_name, const char *transaction)
|
|||||||
/* if we have no connection we just simulate the command */
|
/* if we have no connection we just simulate the command */
|
||||||
if (con && con->connection)
|
if (con && con->connection)
|
||||||
{
|
{
|
||||||
if ((res = PQexec(con->connection, transaction)) == NULL)
|
/* if we are not in autocommit mode, already have committed
|
||||||
|
* the transaction and get another commit, just ignore it */
|
||||||
|
if (!con->committed || con->autocommit)
|
||||||
{
|
{
|
||||||
ECPGraise(lineno, ECPG_TRANS, NULL);
|
if ((res = PQexec(con->connection, transaction)) == NULL)
|
||||||
return FALSE;
|
{
|
||||||
|
ECPGraise(lineno, ECPG_TRANS, NULL);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
PQclear(res);
|
||||||
}
|
}
|
||||||
PQclear(res);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strcmp(transaction, "commit") == 0 || strcmp(transaction, "rollback") == 0)
|
if (strcmp(transaction, "commit") == 0 || strcmp(transaction, "rollback") == 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user