From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 4 May 2017 20:09:27 +0000 (-0700)
Subject: Fix registerTempTableOperation() return value for non-temporary table DROPs
X-Git-Tag: 1.31.0-rc.0~3334^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=25ea9d4f40f599f902c79380fcc5b540d83e247f;p=lhc%2Fweb%2Fwiklou.git

Fix registerTempTableOperation() return value for non-temporary table DROPs

Change-Id: I338dfbbf5479d5157de8d9abc2012cc0e7d10c93
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 88a883ade7..3bb7e6ab5d 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -833,9 +833,10 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 			$sql,
 			$matches
 		) ) {
+			$isTemp = isset( $this->mSessionTempTables[$matches[1]] );
 			unset( $this->mSessionTempTables[$matches[1]] );
 
-			return true;
+			return $isTemp;
 		} elseif ( preg_match(
 			'/^(?:INSERT\s+(?:\w+\s+)?INTO|UPDATE|DELETE\s+FROM)\s+[`"\']?(\w+)[`"\']?/i',
 			$sql,