From 3d17f9896a3b61753083a3dd55166978dabccd98 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Wed, 27 Feb 2008 06:09:51 +0000 Subject: [PATCH] Bug 11980: don't complain on rollback of non-transactional tables. Not sure how to reproduce it, but this should fix it in any case. --- includes/Database.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/Database.php b/includes/Database.php index 69664301c6..f8738288e9 100644 --- a/includes/Database.php +++ b/includes/Database.php @@ -2039,10 +2039,11 @@ class Database { } /** - * Rollback a transaction + * Rollback a transaction. + * No-op on non-transactional databases. */ function rollback( $fname = 'Database::rollback' ) { - $this->query( 'ROLLBACK', $fname ); + $this->query( 'ROLLBACK', $fname, true ); $this->mTrxLevel = 0; } -- 2.20.1