From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 7 Aug 2019 22:06:43 +0000 (-0700)
Subject: rdbms: remove references to SQL_CACHE/SQL_NOCACHE
X-Git-Tag: 1.34.0-rc.0~750
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=daae4857248baaf9aba751c97c2797dedaabf847;p=lhc%2Fweb%2Fwiklou.git

rdbms: remove references to SQL_CACHE/SQL_NOCACHE

Change-Id: I4bace17f7f5171eea9bbf13e7f40fd7027a1ce35
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 8b4ff679f3..5a40f4443a 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -1731,14 +1731,6 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 			$startOpts .= ' SQL_CALC_FOUND_ROWS';
 		}
 
-		if ( isset( $noKeyOptions['SQL_CACHE'] ) ) {
-			$startOpts .= ' SQL_CACHE';
-		}
-
-		if ( isset( $noKeyOptions['SQL_NO_CACHE'] ) ) {
-			$startOpts .= ' SQL_NO_CACHE';
-		}
-
 		if ( isset( $options['USE INDEX'] ) && is_string( $options['USE INDEX'] ) ) {
 			$useIndex = $this->useIndexClause( $options['USE INDEX'] );
 		} else {
diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php
index e480530c7c..6b028679ee 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -716,8 +716,6 @@ interface IDatabase {
 	 *    - SQL_BUFFER_RESULT
 	 *    - SQL_SMALL_RESULT
 	 *    - SQL_CALC_FOUND_ROWS
-	 *    - SQL_CACHE
-	 *    - SQL_NO_CACHE
 	 *
 	 * @param string|array $join_conds Join conditions
 	 *