|
10 | 10 | *
|
11 | 11 | *
|
12 | 12 | * IDENTIFICATION
|
13 |
| - * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.193 2004/10/29 22:19:53 tgl Exp $ |
| 13 | + * $PostgreSQL: pgsql/src/backend/access/transam/xact.c,v 1.194 2004/10/30 20:44:43 tgl Exp $ |
14 | 14 | *
|
15 | 15 | *-------------------------------------------------------------------------
|
16 | 16 | */
|
@@ -2538,16 +2538,16 @@ EndTransactionBlock(void)
|
2538 | 2538 | break;
|
2539 | 2539 |
|
2540 | 2540 | /*
|
2541 |
| - *here, theuser issued COMMIT when not inside a transaction. |
2542 |
| - *Issue aWARNING and go to abortstate. The upcoming call |
2543 |
| - *toCommitTransactionCommand() will thenput us back into |
2544 |
| - * the default state. |
| 2541 | + *Theuser issued COMMIT when not inside a transaction. Issue a |
| 2542 | + * WARNING, staying in TBLOCK_STARTEDstate. The upcoming call to |
| 2543 | + * CommitTransactionCommand() will thenclose the transaction and |
| 2544 | + *put us back intothe default state. |
2545 | 2545 | */
|
2546 | 2546 | caseTBLOCK_STARTED:
|
2547 | 2547 | ereport(WARNING,
|
2548 | 2548 | (errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
|
2549 | 2549 | errmsg("there is no transaction in progress")));
|
2550 |
| -s->blockState=TBLOCK_ABORT_PENDING; |
| 2550 | +result=true; |
2551 | 2551 | break;
|
2552 | 2552 |
|
2553 | 2553 | /* These cases are invalid. */
|
|