mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Remove superfluous query count increment in sql_query_limit
git-svn-id: file:///svn/phpbb/trunk@3871 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
d2db3f75bc
commit
cc1a5f899d
2 changed files with 5 additions and 8 deletions
|
@ -32,15 +32,14 @@ class sql_db
|
||||||
var $transaction = false;
|
var $transaction = false;
|
||||||
var $sql_report = '';
|
var $sql_report = '';
|
||||||
var $sql_time = 0;
|
var $sql_time = 0;
|
||||||
|
var $num_queries = 0;
|
||||||
|
var $open_querues = array();
|
||||||
|
|
||||||
//
|
//
|
||||||
// Constructor
|
// Constructor
|
||||||
//
|
//
|
||||||
function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
|
function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false)
|
||||||
{
|
{
|
||||||
$this->open_queries = array();
|
|
||||||
$this->num_queries = 0;
|
|
||||||
|
|
||||||
$this->persistency = $persistency;
|
$this->persistency = $persistency;
|
||||||
$this->user = $sqluser;
|
$this->user = $sqluser;
|
||||||
$this->password = $sqlpassword;
|
$this->password = $sqlpassword;
|
||||||
|
|
|
@ -32,13 +32,12 @@ class sql_db
|
||||||
var $transaction = false;
|
var $transaction = false;
|
||||||
var $sql_report = '';
|
var $sql_report = '';
|
||||||
var $sql_time = 0;
|
var $sql_time = 0;
|
||||||
|
var $num_queries = 0;
|
||||||
|
var $open_querues = array();
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $port, $persistency = false)
|
function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $port, $persistency = false)
|
||||||
{
|
{
|
||||||
$this->open_queries = array();
|
|
||||||
$this->num_queries = 0;
|
|
||||||
|
|
||||||
$this->persistency = $persistency;
|
$this->persistency = $persistency;
|
||||||
$this->user = $sqluser;
|
$this->user = $sqluser;
|
||||||
$this->password = $sqlpassword;
|
$this->password = $sqlpassword;
|
||||||
|
@ -138,7 +137,7 @@ class sql_db
|
||||||
$curtime = $curtime[0] + $curtime[1] - $starttime;
|
$curtime = $curtime[0] + $curtime[1] - $starttime;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$this->query_result = @mysql_query($query, $this->db_connect_id))
|
if (!($this->query_result = @mysql_query($query, $this->db_connect_id)))
|
||||||
{
|
{
|
||||||
$this->sql_error($query);
|
$this->sql_error($query);
|
||||||
}
|
}
|
||||||
|
@ -210,7 +209,6 @@ class sql_db
|
||||||
if ($query != '')
|
if ($query != '')
|
||||||
{
|
{
|
||||||
$this->query_result = false;
|
$this->query_result = false;
|
||||||
$this->num_queries++;
|
|
||||||
|
|
||||||
$query .= ' LIMIT ' . ((!empty($offset)) ? $offset . ', ' . $total : $total);
|
$query .= ' LIMIT ' . ((!empty($offset)) ? $offset . ', ' . $total : $total);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue