Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes #1567438 - Wrong transaction type was being catched in a MySQL transaction specific loop when releasing transactions

8.0.x
Pierre Rineau 2012-05-09 22:26:52 +02:00
parent 037ac94025
commit 60ebceebf9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
View File

@ -7,6 +7,8 @@
namespace Drupal\Core\Database\Driver\mysql; namespace Drupal\Core\Database\Driver\mysql;
use Drupal\Core\Database\DatabaseExceptionWrapper;
use Drupal\Core\Database\Database; use Drupal\Core\Database\Database;
use Drupal\Core\Database\TransactionCommitFailedException; use Drupal\Core\Database\TransactionCommitFailedException;
use Drupal\Core\Database\DatabaseException; use Drupal\Core\Database\DatabaseException;
@ -180,7 +182,7 @@ class Connection extends DatabaseConnection {
try { try {
$this->query('RELEASE SAVEPOINT ' . $name); $this->query('RELEASE SAVEPOINT ' . $name);
} }
catch (PDOException $e) { catch (DatabaseExceptionWrapper $e) {
// However, in MySQL (InnoDB), savepoints are automatically committed // However, in MySQL (InnoDB), savepoints are automatically committed
// when tables are altered or created (DDL transactions are not // when tables are altered or created (DDL transactions are not
// supported). This can cause exceptions due to trying to release // supported). This can cause exceptions due to trying to release
@ -188,7 +190,7 @@ class Connection extends DatabaseConnection {
// //
// To avoid exceptions when no actual error has occurred, we silently // To avoid exceptions when no actual error has occurred, we silently
// succeed for MySQL error code 1305 ("SAVEPOINT does not exist"). // succeed for MySQL error code 1305 ("SAVEPOINT does not exist").
if ($e->errorInfo[1] == '1305') { if ($e->getPrevious()->errorInfo[1] == '1305') {
// If one SAVEPOINT was released automatically, then all were. // If one SAVEPOINT was released automatically, then all were.
// Therefore, clean the transaction stack. // Therefore, clean the transaction stack.
$this->transactionLayers = array(); $this->transactionLayers = array();