#301049 follow-up

From:  <>


---

 includes/database/database.inc              |    2 +-
 includes/database/query.inc                 |    3 +--
 modules/simpletest/tests/database_test.test |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git includes/database/database.inc includes/database/database.inc
index 58a0fcf..dbe30e8 100644
--- includes/database/database.inc
+++ includes/database/database.inc
@@ -851,7 +851,7 @@ abstract class DatabaseConnection extends PDO {
 
     if ($this->transactionLayers == 1) {
       if ($this->supportsTransactions()) {
-        parent::startTransaction();
+        parent::beginTransaction();
       }
 
       // Reset any scheduled rollback
diff --git includes/database/query.inc includes/database/query.inc
index c8e312d..57a9e67 100644
--- includes/database/query.inc
+++ includes/database/query.inc
@@ -690,8 +690,7 @@ class MergeQuery extends Query {
       $this->connection->insert($this->table, $this->queryOptions)->fields($insert_fields)->execute();
     }
 
-    // Commit the transaction.
-    $transaction->commit();
+    // Transaction commits here where $transaction looses scope.
   }
 
   public function __toString() {
diff --git modules/simpletest/tests/database_test.test modules/simpletest/tests/database_test.test
index 3e9fd41..a03a57f 100644
--- modules/simpletest/tests/database_test.test
+++ modules/simpletest/tests/database_test.test
@@ -2255,8 +2255,8 @@ class DatabaseTransactionTestCase extends DatabaseTestCase {
         // on a database that does not actually support transactions, and
         // the current database does claim to NOT support transactions.
         $txn = db_transaction(TRUE);
+        $this->fail('No transaction failure registered.');
       }
-      $this->fail('No transaction failure registered.');
     }
     catch (TransactionsNotSupportedException $e) {
       $this->pass('Exception thrown for unsupported transactions.');