From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 17 Oct 2018 16:40:16 +0000 (+0000)
Subject: Merge "rdbms: do not treat SAVEPOINT and RELEASE SAVEPOINT as write queries"
X-Git-Tag: 1.34.0-rc.0~3743
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=9852bdaa6a21ac8103be4221ce9ca8768ae94822;hp=c27ea8dbd1ed4f5f2b52ca0e79aad117f74346e5;p=lhc%2Fweb%2Fwiklou.git

Merge "rdbms: do not treat SAVEPOINT and RELEASE SAVEPOINT as write queries"
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 68d4c9aa87..3d23a83d4f 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -1052,7 +1052,9 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 		//   that transactions by themselves don't make changes, only actual writes
 		//   within the transaction matter, which we still detect.
 		return !preg_match(
-			'/^(?:SELECT|BEGIN|ROLLBACK|COMMIT|SET|SHOW|EXPLAIN|\(SELECT)\b/i', $sql );
+			'/^(?:SELECT|BEGIN|ROLLBACK|COMMIT|SAVEPOINT|RELEASE|SET|SHOW|EXPLAIN|\(SELECT)\b/i',
+			$sql
+		);
 	}
 
 	/**