Restore check for zero or negative transaction nesting

silverstripe · Jun 20, 2018 · df25768 · df25768
1 parent d8430f5
commit df25768
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/ORM/Connect/MySQLDatabase.php b/src/ORM/Connect/MySQLDatabase.php
@@ -360,7 +360,10 @@ public function transactionEnd($chain = false)
             return false;
         }
         --$this->transactionNesting;
-        $this->query('COMMIT AND ' . ($chain ? '' : 'NO ') . 'CHAIN');
+        if ($this->transactionNesting <= 0) {
+            $this->transactionNesting = 0;
+            $this->query('COMMIT AND ' . ($chain ? '' : 'NO ') . 'CHAIN');
+        }
         return true;
     }