Merge "rdbms: Remove support for PostgreSQL < 9.2, and improve INSERT IGNORE for...

[lhc/web/wiklou.git] / includes / libs / rdbms / database / Database.php

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 51d5466..2ef8822 100644 (file)
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -1150,7 +1150,9 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                                                $this->makeQueryException( $lastError, $lastErrno, $sql, $fname );
                                        $tempIgnore = false; // cannot recover
                                } else {
-                                       # Nothing prior was there to lose from the transaction
+                                       # Nothing prior was there to lose from the transaction,
+                                       # so just roll it back.
+                                       $this->doRollback( __METHOD__ . " ($fname)" );
                                        $this->trxStatus = self::STATUS_TRX_OK;
                                }
                        }