From: Tim Starling <tstarling@users.mediawiki.org>
Date: Fri, 23 Jul 2004 12:36:22 +0000 (+0000)
Subject: fixed bug with masterPosWait()
X-Git-Tag: 1.5.0alpha1~2617
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/supprimer.php?a=commitdiff_plain;h=8fd8374c3477c4a12d76f1953cb3aee98fd368f8;p=lhc%2Fweb%2Fwiklou.git

fixed bug with masterPosWait()
---

diff --git a/includes/Database.php b/includes/Database.php
index 29d7e96fc3..2771995020 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -818,9 +818,9 @@ class Database {
 	}
 
 	# Do a SELECT MASTER_POS_WAIT()
-	function masterPosWait( $file, $pos ) {
+	function masterPosWait( $file, $pos, $timeout ) {
 		$encFile = $this->strencode( $file );
-		$sql = "SELECT MASTER_POS_WAIT('$encFile', $pos)";
+		$sql = "SELECT MASTER_POS_WAIT('$encFile', $pos, $timeout)";
 		$res = $this->query( $sql, "Database::masterPosWait" );
 		if ( $res && $row = $this->fetchRow( $res ) ) {
 			$this->freeResult( $res );