From c278bc2e0931401c4b18ce5d61c626b80b7ab798 Mon Sep 17 00:00:00 2001
From: Max Semenik <maxsem@users.mediawiki.org>
Date: Tue, 23 Nov 2010 11:21:00 +0000
Subject: [PATCH] Fixed $fname in some places

---
 includes/db/DatabaseIbm_db2.php | 10 +++++-----
 includes/db/DatabaseMysql.php   |  2 +-
 includes/db/DatabaseOracle.php  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/includes/db/DatabaseIbm_db2.php b/includes/db/DatabaseIbm_db2.php
index 0105a23b7c..b259be675a 100644
--- a/includes/db/DatabaseIbm_db2.php
+++ b/includes/db/DatabaseIbm_db2.php
@@ -1037,7 +1037,7 @@ EOF;
 	 *                 more of IGNORE, LOW_PRIORITY
 	 * @return Boolean
 	 */
-	public function update( $table, $values, $conds, $fname = 'Database::update',
+	public function update( $table, $values, $conds, $fname = 'DatabaseIbm_db2::update',
 		$options = array() )
 	{
 		$table = $this->tableName( $table );
@@ -1062,10 +1062,10 @@ EOF;
 	 *
 	 * Use $conds == "*" to delete all rows
 	 */
-	public function delete( $table, $conds, $fname = 'Database::delete' ) {
+	public function delete( $table, $conds, $fname = 'DatabaseIbm_db2::delete' ) {
 		if ( !$conds ) {
 			throw new DBUnexpectedError( $this,
-			'Database::delete() called with no conditions' );
+				'DatabaseIbm_db2::delete() called with no conditions' );
 		}
 		$table = $this->tableName( $table );
 		$sql = "DELETE FROM $table";
@@ -1463,7 +1463,7 @@ SQL;
 	 * @return Bool
 	 */
 	public function indexUnique ( $table, $index,
-		$fname = 'Database::indexUnique' )
+		$fname = 'DatabaseIbm_db2::indexUnique' )
 	{
 		$table = $this->tableName( $table );
 		$sql = <<<SQL
@@ -1518,7 +1518,7 @@ SQL;
 	{
 		if ( !$conds ) {
 			throw new DBUnexpectedError( $this,
-			'Database::deleteJoin() called with empty $conds' );
+				'DatabaseIbm_db2::deleteJoin() called with empty $conds' );
 		}
 
 		$delTable = $this->tableName( $delTable );
diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index 8a6d3527fc..10c6cf268b 100644
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -249,7 +249,7 @@ class DatabaseMysql extends DatabaseBase {
 	 * Returns estimated count, based on EXPLAIN output
 	 * Takes same arguments as Database::select()
 	 */
-	public function estimateRowCount( $table, $vars='*', $conds='', $fname = 'Database::estimateRowCount', $options = array() ) {
+	public function estimateRowCount( $table, $vars='*', $conds='', $fname = 'DatabaseMysql::estimateRowCount', $options = array() ) {
 		$options['EXPLAIN'] = true;
 		$res = $this->select( $table, $vars, $conds, $fname, $options );
 		if ( $res === false ) {
diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index b258ca588b..33e1104a56 100644
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -973,7 +973,7 @@ class DatabaseOracle extends DatabaseBase {
 
 	function fieldInfo( $table, $field ) {
 		if ( is_array( $table ) ) {
-			throw new DBUnexpectedError( $this, 'Database::fieldInfo called with table array!' );
+			throw new DBUnexpectedError( $this, 'DatabaseOracle::fieldInfo called with table array!' );
 		}
 		return $this->fieldInfoMulti ($table, $field);
 	}
-- 
2.20.1